This repository has been archived by the owner on Sep 18, 2021. It is now read-only.
forked from fizx/scala-bootstrapper
-
Notifications
You must be signed in to change notification settings - Fork 51
--git option to track generated files in scala-bootstrapper branch #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
i tried this out on ostrich, but it doesn't look like it works. robey@jonsnow: On branch fetch_statsnothing to commit (working directory clean) |
… the ex post facto case
Conflicts: README.rdoc
Looks like some of this was merged several days ago, thanks! Would you please merge the remaining fixes? Or, Kyle, if you want me to do it myself let me know. |
[kmaxwell@tw-mbp-kmaxwell ~/workspace]$ ./scala-bootstrapper/bin/scala-bootstrapper --git addressbook |
The README says you are supposed to cd into the project directory, then run scala-bootstrapper. |
Conflicts: bin/scala-bootstrapper
ping? |
+1 |
fizx
pushed a commit
that referenced
this pull request
Jun 1, 2011
--git option to track generated files in scala-bootstrapper branch
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For new projects:
First run: generate files into scala-bootstrapper branch, merge it to master
Subsequent runs: same thing
For existing projects (where scala-bootstrapper is not already a parent of master head)
First run: generate files into scala-bootstrapper branch, merge it to master but don't actually merge the changes (it becomes an ancestor of master)
Subsequent runs: generate files into scala-bootstrapper branch, merge it to master